Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Missing stuff #4

Open
ojura opened this issue Apr 6, 2017 · 1 comment
Open

Missing stuff #4

ojura opened this issue Apr 6, 2017 · 1 comment

Comments

@ojura
Copy link
Collaborator

ojura commented Apr 6, 2017 •
edited
Loading

  • merging: git merge --abort, git diff ...other, git merge --continue instead of git commit?
  • git merge --abort
  • last task should be in parallel for mirko and slavko
  • git checkout <commit> and branching from there
  • git branch -a
  • pull before you start working!
@dmiklic
Copy link
Contributor

dmiklic commented Aug 29, 2021

+1
Another thing I was wondering about is where are successfully merged changes visible during a merge with conflicts. Is there a way to show their diff?

Also, I suggest renaming this issue to explicitly mention the merge verb.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@dmiklic @ojura