Skip to content
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.

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

Diff with file on remote branch #53

Closed
rndware opened this issue Aug 18, 2020 · 2 comments
Closed

Diff with file on remote branch #53

rndware opened this issue Aug 18, 2020 · 2 comments

Comments

@rndware
Copy link

rndware commented Aug 18, 2020

Currently there is not a plugin I'm aware of that can do a diff between the currently opened file and the same one on a specified branch name.

This is extremely handy if you're working on a feature branch, master gets updated, and you want to check what conflicts might arise if you attempt to merge the file.

I've just created a working POF:

#52

I'm wondering if this could be part of a forked 'git diff' type of extension that could diff between refs of all different types.

Food for thought :)

@ryu1kn
Copy link
Owner

ryu1kn commented Dec 13, 2020

Thanks for the idea. That would be handy though that would be a feature for "git diff" type extension as you wrote. It would essentially be:

git diff origin/remote-branch-name -- path/to/file-for-comparison.txt

@ryu1kn
Copy link
Owner

ryu1kn commented Dec 13, 2020

I'm closing this for now, but feel free to reopen it if you think we should continue exploring this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

2 participants