Skip to content

Issues: mhagger/git-imerge

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

55 Open 62 Closed
55 Open 62 Closed
Author
Filter by author
Loading
Label
Filter by label
Loading
Use alt + click/return to exclude labels
or ⇧ + click/return for logical OR
Projects
Filter by project
Loading
Milestones
Filter by milestone
Loading
Assignee
Filter by who’s assigned
Sort
Sort by
Newest Oldest Most commented Least commented Recently updated Least recently updated Best match
Most reactions
👍 👎 😄 🎉 😕 ❤️ 🚀 👀

Issues list

Request: Add --update-refs option to git-imerge
#213 opened Jul 20, 2024 by ramcdona
Empty commits after rebase
#212 opened Jul 17, 2024 by abitrolly
1
Undocumented requirement: setuptools
#210 opened May 22, 2024 by dabrahams
add support for new Python pyproject.toml standard: setup.py install is deprecated
#208 opened Aug 4, 2023 by pabs3
possibility of merging unrelated histories
#203 opened Feb 15, 2023 by Avinash-Bhat
backtracking repeats unrelated autofills
#202 opened Jan 19, 2023 by jrosenberger
Stuck in a merge, imerge crashes when attempting to continue
#199 opened Dec 7, 2022 by vmsh0
2
[Request] Keep diff3 conflictstyle as clear as without imerge
#197 opened Sep 30, 2022 by tuxayo
3
add a stop, abort, or similar command
#189 opened Mar 29, 2022 by jacob-keller
5
Is it possible to redo parts of an iterative merge?
#188 opened Aug 25, 2021 by BowiFromStackOverflow
4
non-zero exit status 128
#187 opened Jul 30, 2021 by jeacott1
2
Merging a branch that has merge commits
#186 opened May 26, 2021 by OliverJAsh
1
Error: untracked working tree files aborts imerge
#184 opened Apr 20, 2021 by egpbos
6
Skip incompatible merges
#171 opened Sep 30, 2020 by NZJenkins
1
Interactive Rebase With History Preserving Past Merges
#170 opened Sep 22, 2020 by RandomDSdevel
1
Option to keep original commit message in goal=rebase-with-history
#164 opened Sep 14, 2020 by ravirajkarasulli
1
Make it easy to amend a completed imerge
#163 opened Sep 12, 2020 by dabrahams
1
Please document my options w.r.t. merge resolution
#162 opened Sep 11, 2020 by dabrahams
1
imerge sometimes reports a conflict, leaving unmerged files with zero conflicts
#161 opened Sep 10, 2020 by dabrahams
11
Allow "python setup.py install --user"
#159 opened Aug 3, 2020 by thehans
1
--goal='rebase' is not yet supported for branches that include merges.
#151 opened Jun 16, 2020 by abitrolly
3
autofilling not optimal?
#149 opened Jun 10, 2020 by skok-gpfw
2
Shell completion for HEAD ref ignores tags
#147 opened May 5, 2020 by jasonkarns
1
Equivalent of the most general case git rebase --onto COMMIT1 COMMIT2 COMMIT3?
#146 opened Apr 4, 2020 by rulatir
5
Add a --transposed option to the diagram subcommand
#145 opened Jan 9, 2020 by waldyrious
4
ProTip! Adding no:label will show everything without a label.