> It is fine, if there are conflicts and will juggle them :) If you try to merge directly, there will be conflicts. But if you do what I describe below, it should require no manual assistance and will ease the pain to literally zero effort.
// get the latest changes (I assume origin points at apache or github). git fetch origin // get your branch. I assume it compiles. git checkout my-branch // get the latest spotless scripts from master and apply it locally git checkout master -- gradle // reformat code on my-branch ./gradlew tidy git commit -am "Just applying the formatter" // now diff against the (reformatted) master - you should only see your local // changes; the code is formatted identically on both branches. git diff origin/master // and merge if you like. git merge origin/master D. --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
