在Git中,如果你对它不满意,你如何回滚一个rebase？
Git没有干运行的rebase.如果我做了一个rebase并且尚未推送它,我怎么回滚到之前,好像从未发生过？
如何查看分支的提交版本git.例如,我的分支Dev有一个提交ad4f43af43e.我该如何查看该提交？不只是一个文件,而是整个分支.我在网上搜索并发现:git checkout <commit>,但它没有指定分支名称
谢谢.
在spark-submit中，如何指定log4j.properties？
这是我的剧本。我已经尝试了所有组合，甚至只使用一个本地节点。但似乎未加载log4j.properties，所有调试级别的信息都已转储。
current_dir=/tmp
DRIVER_JAVA_OPTIONS="-Dlog4j.configuration=file://${current_dir}/log4j.properties "
spark-submit \
--conf "spark.driver.extraClassPath=$current_dir/lib/*" \
--conf "spark.driver.extraJavaOptions=-Djava.security.krb5.conf=${current_dir}/config/krb5.conf -Djava.security.auth.login.config=${current_dir}/config/mssqldriver.conf" \
--conf "spark.executor.extraJavaOptions=-Dlog4j.configuration=file://${curent_dir}/log4j.properties " \
--class "my.AppMain" \
--files ${current_dir}/log4j.properties \
--master local[1] \
--driver-java-options "$DRIVER_JAVA_OPTIONS" \
--num-executors 4 \
--driver-memory 16g \
--executor-cores 10 \
--executor-memory 6g \
$current_dir/my-app-SNAPSHOT-assembly.jar
log4j属性：
log4j.rootCategory=INFO, console
log4j.appender.console=org.apache.log4j.ConsoleAppender
log4j.appender.console.layout=org.apache.log4j.PatternLayout
log4j.appender.console.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
log4j.additivity.org=false
log4j.logger.org=WARN
parquet.hadoop=WARN
log4j.logger.com.barcap.eddi=WARN
log4j.logger.com.barcap.mercury=WARN
log4j.logger.yarn=WARN
log4j.logger.io.netty=WARN
log4j.logger.Remoting=WARN
log4j.logger.org.apache.hadoop=ERROR
# this disables the table creation logging which is so verbose
log4j.logger.hive.ql.parse.ParseDriver=WARN
# this disables pagination nonsense …在Scala/Spark中,如何将空字符串(如"")转换为"NULL"？需要先修剪它然后转换为"NULL".谢谢.
dataframe.na.replace("cut", Map(" " -> "NULL")).show //wrong
我做了一个Git rebase,修复了冲突和强制推力,为什么它仍然是rebase模式,"dev | REBASE 2/3"？怎么退出呢？我不想丢掉这个篮板.
aaa@lenovo-pc MINGW64 ~/Documents/NetBeansProjects/GitTest1 (dev|REBASE 2/3)
$ git status
rebase in progress; onto f67f4c5
You are currently rebasing branch 'dev' on 'f67f4c5'.
(all conflicts fixed: run "git rebase --continue")
nothing to commit, working tree clean
aaa@lenovo-pc MINGW64 ~/Documents/NetBeansProjects/GitTest1 (dev|REBASE 2/3)
$ git push --force origin dev
git@192.168.1.8's password:
Everything up-to-date
aaa@lenovo-pc MINGW64 ~/Documents/NetBeansProjects/GitTest1 (dev|REBASE 2/3)
谢谢
在 Git 中，master 分支的更改应该集成到 dev 分支中。我首先在本地磁盘中制作了 DEV 的副本，然后将 master 重新设置为 DEV 分支。然后使用WinMerge手动比较文件。
但看起来这个策略不起作用。我做了一些搜索，解决方案之一是使用推送“强制”来修复它。我们还有其他优雅的方式吗？
这是我的步骤：
aa@lenovo-pc MINGW64 /c/temp/TestGit2App (DevelopmentBranch)
$ git rebase -Xours master #keep the master changes first
# use WinMerge to merge changes back to files ...
git add -A
git commit -m "ddd"
git push
To 192.168.1.8:/home/git/TestGit2App.git
! [rejected] DevelopmentBranch -> DevelopmentBranch (non-fast-forward)
error: failed to push some refs to 'git@192.168.1.8:/home/git/TestGit2App.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. …