Re: fast forward merge overwriting my code

[Bagas Sanjaya <bagasdotme@gmail.com>]

Hi Andre,

On 24/05/21 13.13, Andre Ulrich wrote:
> So the last point is where we still want to do some fine tuning. Right now this looks about: my prof fetches my edits and locally checks out a branch to compare the changes with git diff.
> But in this diff view you can't edit the files. So you have to separately open up another window to edit the changes (lets say my prof only wants to keep some of my changes, but not all).
> 
> So my Question is: is there any possibility, to be able to view (and even edit, if necessary) the changed notebook in the merging process (as in my example with the 3way merge)?
> Or is the only option to separately view the diff and edit the notebook (two seperate steps instead of one)?
> 
> The latter would also be acceptable, if it really is the only way. Bu it would be nice, if viewing and editing could be done in one convenient step during merging.

When you run git merge, when Git decided that automerging with 3-way
merge can be done without conflicts, the editor will be fired up for
you to enter commit message. Delete or comment all the message lines
to abort the commit by "empty message" mechanism.

Now you can view diff (git diff) or edit the merged files as you
wish. Of course, you can coordinate with author of branch you're
merging from to get consensus. After then, git commit.

Similar steps can be done for merge conflicts. Git will pause merging
process when conflicts occur, and you need to edit to resolve them.
Again, coordinating with original branch author is helpful to decide
the resolution.

Thanks.

-- 
An old man doll... just what I always wanted! - Clara