Check out the aq
branch, and rebase from master
.
git checkout aq
git rebase master
More Related Contents:
- I ran into a merge conflict. How can I abort the merge?
- When do you use Git rebase instead of Git merge?
- Git workflow and rebase vs merge questions
- Undo git pull, how to bring repos to old state
- I ran into a merge conflict. How do I abort the merge?
- Sharing rerere cache
- How do I discard unstaged changes in Git?
- Undo a Git merge that hasn’t been pushed yet
- Have Git Select Local Version On Merge Conflict on a Specific File?
- Why do I need to explicitly push a new branch?
- Committing Machine Specific Configuration Files
- What does “Git push non-fast-forward updates were rejected” mean?
- Git merge left HEAD marks in my files
- Gitlab repository mirroring
- How do I delete all Git branches which have been merged?
- Git log output to XML, JSON, or YAML?
- How to update a pull request from forked repo?
- How can I create a Git repository with the default branch name other than “master”?
- Git allows for branch change with unstaged changes
- Why is “origin/HEAD” shown when running “git branch -r”?
- tell git to use ours merge strategy on specific files
- git merge, keep both
- how do you push only some of your local git commits?
- How to sync changes on my local server with the ones on the remote one without commiting?
- How do you undo “Discard all changes” in VS Code/Git
- Git: Ignore files for public repository, but not for private
- Git: How to make outer repository and embedded repository work as common/standalone repository?
- Telling if a Git commit is a Merge/Revert commit
- How to quit (not abort) a Git merge in progress keeping the changes uncommitted?
- Other consequences of `git push –force`?