This repo is to test git with regard to different patterns. Updating the main branch and a dev branch separately. And then updating the dev branch with the updates in main but not vice versa.
I'm trying to squash a couple of commits togeter before pushing to the remote repo. I did one commit and now this sentences will go into the second commit. And a another sentence that goes into commit 3. Using gitlense, right clicking in the commit graph on the commit that should be the base for the squashed commits and "Rebase current branch onto Commit ..." and confirming the Interactive Rebase worked. In the editor choose squash for all the commits that should be squashed. the first one after the base will not have the squash option. another change that should be added to the previous commit that contains the first set of squashed changes
Doing this again without gitlense commit graph because it is a Pro feature. And a second change.
This should go into a commit that should be the new base.
first change for first commit.
second change for second commit.
third change for third commit.
On dev branch:
- change 1
- change 2
- change 3