3 ms·
I have used IntelliJ's Git UI and never noticed it having those features as described in the article (such as reword without checking out or merge conflict prev
by arxanas 4y ago
I have used IntelliJ's Git UI and never noticed it having those features as described in the article (such as reword without checking out or merge conflict previews). Can you show me where to find those features?
- efortis 4y agoReword: https://www.jetbrains.com/help/idea/edit-project-history.html https://www.jetbrains.com/help/idea/edit-project-history.htm... Resolve Merge Conflicts: https://www.jetbrains.com/help/idea/resolve-conflicts.html https://www.jetbrains.com/help/idea/resolve-conflicts.html
- arxanas 4y agoIf I'm reading this correctly, you cannot reword a commit without first checking it out, and you cannot preview merge conflicts without first starting a merge/rebase operation? Those are the criteria as described at https://blog.waleedkhan.name/git-ui-features/#rubric https://blog.waleedkhan.name/git-ui-features/#rubric
- david_allison 4y agoReword: you don't need to check out the commit. The 'log' tab shows a tree of the commits to the repo. This log can be filtered in multiple ways: for example by branch or via a search string. You may right click a commit to reword.
- arxanas 4y agoThanks. I confirmed that you can reword a commit which is reachable from `HEAD`, but not those on other branches in this way, similar to Sublime Merge elsewhere in the comments.
- david_allison 4y agoTo confirm we're not taking past each other: You can change 'Branch' to 'All' to see everything, and then re-filter.
- arxanas 4y agoI right-clicked commits not reachable from `HEAD` and the Edit Commit Message option was disabled, so I'm assuming it can only reword commits reachable from `HEAD`.
- david_allison 4y agoI profusely apologise, I was incorrect.