Closed ZhiyLiu closed 4 years ago
@jcfr Apologies for irregular submissions. A Git session related to safely and straightforward rebase, squash or other common operations would be helpful to me now. My situation is that I often switch back and forth between multiple projects. I usually forget which branch is newer. If I start from an older branch, conflict might happen and I need to merge. To avoid this, the most efficient way for me is to develop a new branch on the top of the latest branch, though the new branch includes code from the older pull request.
I also made a few mistakes w.r.t merging rebased code that have different trail spaces in files or different file permission. I wish the solution can also be explained.
Accumulated submission: