Out of sudden I noticed the git options not working in my visual code editor. All I see are the plain text, they used to be segment in different background color and also links where I can click to accept incoming/remain current changes etc..
Current problem is showing this
Should be like this
In VS code there is another way to merge code conflicts which you can find
Settings -> Git Merge (under user tab).
just uncheck that and then it will show you Merge options on your page like you are looking for.
Hope this helps.
Related
I know I can manually go to PR and uncheck Viewed. Is there a shortcut to uncheck on all files in the PR?
Found some relevant issues on GitHub
https://github.com/refined-github/refined-github/issues/2444
Why I want to do it?
To be able to see the comments and expand the cards which are collapsed because I manually marked viewed.
I tried Option+Click on Mac , didn't work for me.
Don't think the UI currently supports that. It looks like you need to tick, all checkboxes manually. Or come up with a JavaScript to find and click them for you.
Try that in your browser console.
document.getElementsByName("viewed").forEach(ch => {if(ch.checked) {ch.click()}})
I am using visual studio code to develop my flutter app.
I need to share it with a colleague. I was able to make the transfer on gitlab very easily.
I have a problem.
When my colleague makes changes to my code, before "taking" his changes I would like to be able to view them on visual studio code.
I have tried several avenues, but each time my code is synchronized and modified according to the changes made
Can anyone help me?
1:Click Git icon on left side of VS Code
2:If you've made changes to the file(s) since last commit, you'll see the file(s) listed under "CHANGES"
3:Right click the file name (under "CHANGES") and click "Open Changes"
4:This will open the two versions of the file side by side with the changes highlighted
I believe this is how you see the changes that your college made on GitLab
When you install my extension, and you click on "Contributions" in VSCode, it only shows a blank page.
enter image description here
I have no clue why that is.. the package.json looks fine though..
How can I show the contributions like any other extension does?
This was a bug in VS Code 1.27. It is fixed in VS Code 1.28+
I used to have the same issue!
I used to create new branches for different lessons learned which were never part of the main branch.
Merging the branches to main(master) updated my contributions.
Is it possible in EGit to see the simple history of a file?
Team > Show in history shows all commits to all files. Not useful.
I am looking for the history of a file. There is a button in the History view that says Show changes to selected resource but no way to select a resource.
There also does not appear to be any way to compare with a specific version unless that version has a tag.
The pieces seem to be there, but are they put together properly?
(No complex branching or other cleverness. I normally use the command line for this type of work but should not have to.)
You can open a file (or select it from project explorer) and do:
Right Click -> Team -> Show in history. This will open the following view:
The filter circled in red is: "Show all changes of selected resource and its children" which basically will filter only the commits that relate in any way to the resource you've selected (you can chose the different filters to get a better understanding of how they differ from each other).
The problem was that the Team > Show in History needs to be run from the Project Explorer window. When I first found those scoping buttons I right clicked on the class file's edit window and did the Team > Show in History there. That appears to be broken and only shows all changes.
(Thank you for your replies. Knowing that it could be done and by those scope buttons let me look further. I rarely use the Project Explorer, preferring to just type the class/file name into the Navigate dialog.)
Some other answers suggest clicking on Team > Show in History. This menu item does not show up. Instead, Team > Show Local History shows up.
I have Git Staging tab open all the time. I saved a small change to the file I wanted to see the history of. This caused the file to show up in the Unstaged Changes in Git Staging. I then right-clicked on the file, clicked on Show In and then History. This showed me the history of the file according to Git.
I have installed the MercurialEclipse plugin. I am finding it very hard to use.
I have been using the Mercurial support in NetBeans for a while now, there are many things I would like to be able to do in Eclipse if possible:
In NetBeans any changes to source code are highlighted in the line
number area. New code is green, modified code is blue, and removed
code is red.
Files in the project explorer appear as blue or green for modified
and new respectively.
In NetBeans I can right click any directory in the project explorer
and go to Mercurial->diff to get a visual diff for all files (in the
directory I clicked) that have changed since the last commit.
When I right click a directory in Eclipse I am given a compare with but
with only 1 option (each other) that is disabled.
Even worse, when I
right click an actual file I know has changed and go to compare with I am
given 3 options (local history, parent changeset, different
changeset). If I click parent changeset it does not give me a diff. I assume this is beacause its the first time the file has changed since 3 commits ago. Which doesn't make since, I just want to see what I have changed to review it before commiting. I would like this to show me the changes I have made since my last commit i.e. the changes I will be committing.
Please note I am not trying to bash on Eclipse and I am not trying to Praise NetBeans. I am just wanting to know if there is a way to setup a workflow in Eclipse like I am used to in NetBeans.
Some of the things you are requesting are not specific to the VCS you are using, they are part of the Eclipse Team support, so they will work with any VCS system.
1) Showing the code changes: The closest Eclipse has to that is Team -> Show Annotations, but I don't think this will show the added/changed/deleted lines from the current version. I would file an enhancement request to Eclipse about this.
2) Eclipse shows different icons for added and changed files. You should see a blue + for an added file and a brown * for a changed file.
3) To easily get a diff from what's committed, you can do Team -> Synchronize. This brings up the Synchronize View. Another way is you can do a Team -> Commit at any level and then in the listing of the files, double-click the file which will bring up the comparison between the files (that will show one file at a time). Another thing you can do is select Compare -> Another Revision... and select the desired revision in the dialog (this will show all enclosed files in a single compare editor). Finally, the Compare -> Parent Changeset on a specific file does shows the changes from the committed parent for me, even if it was not changed in the most recent revision. It's possible you have encountered a bug in Mercurial Eclipse.
Be sure you are using the latest version of Eclispe and also Mercurial Eclipse. Mercurial Eclipse is pretty active and they are adding and fixing things all the time. I tested this on Eclipse 3.7.1 with Mercurial Ecipse 1.9.1.
This is an older question, but i had the same problem, and found this info useful.
I'm transitioning from netbeans to eclipse. I'm no expert but:
For text highligting you can use the "quick diff"
a. Windows -> preferences -> General -> editors -> quickdiff
b. enabling quick diff with mercurial quickdiff seems to mimic netbeans mostly.
For diff's of a changeset of files. I think you need to use the Team Syncroniztion perspective as is mentioned before. Its actually pretty slick once you get used to it.