I am still new to git and I am trying to use the git with java. So, I have a java file and inside this file, I started providing print statements and commit each time I finish a print statement to be able to use the git revert. So, let's say:
- The first commit: I added my name
- The second commit: I added my job
- The third commit: I added my address
Hence, here in each version of the code I have a print statement added to my java code.
Now, when am trying to revert the second commit using: git revert while providing the commit id of the second commit, it's telling me that I have conflicts that I should resolve, knowing that I haven't changed anything in the subsequent commits after commit #2, I just added print statement for third commit.
All what I need to do is to try to use the git revert to remove the second commit and have a version containing the first and last print statements.
Please if could anyone help in this matter, thanks!
Related
I have created two branch with the same feature/Dev23 and feature/dev23.
At the time of checkout in IntelliJ I was getting "there exist a branch with the same name".
So I deleted one (feature/Dev23) and checkout the new feature/dev23.
But now I want this branch as well.
I am expecting the branch to be seen in Bitbucket and retrieve it properly.
But now I want this branch as well.
From a command line, check the output of git reflog: you can use said output to recover a deleted branch (assuming it was deleted recently)
git switch -c feature/old-Dev23 HEAD#{**number**}
If feature/Dev23 is not listed in reflog (because you never switch to it), check the output of git branch -avv, and:
git switch -c feature/old-Dev23 origin/Dev23
Note I use a different name to re-create the branch, that way it does not interfere with your new feature/dev23.
See this answer bon branch name case sensitivity.
I try to rebase my branch to catch up with master. But Git fails with the given problem:
...
warning: squelched 41 whitespace errors
warning: 46 lines add whitespace errors.
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): project/package/XXX.java deleted in CommitName and modified in HEAD. Version HEAD of project/package/XXX.java left in tree.
It seams that in the branch I deleted a file within a patch and that file got modified on master as well. When I now try to rebase the branch to origin/master, the merge process does not know what to do with the patch since the file I delete has changed now and the patch can not further applied.
What is the best way to fix it?
When a merge conflict like such occurs, you'll notice that you are still in process of rebase. In order to continue, those files need to be staged. You can stage the change with either git rm or git add. Then you have to continue the rebase with git rebase --continue.
I need to sequentially check out tags over a branch I created with JGit.
CheckoutCommand checkout = new Git(testRepository).checkout();
if (!branchExists())
checkout.setCreateBranch(true).setName("branch-for-test").setStartPoint(key);
else
checkout.setName(key);
checkout.call();
Where key is a String which contains the name of the commit I want to checkout (key changes in a loop). I don't want to create a branch each time I checkout as I don't need to. The following error is shown:
org.eclipse.jgit.api.errors.JGitInternalException: Could not rename file target\TestRepository\server\db\scripts\postgresql\._db_script.sql6197897692249726905.tmp to target\TestRepository\server\db\scripts\postgresql\_db_script.sql
at org.eclipse.jgit.api.CheckoutCommand.call(CheckoutCommand.java:320)
Before this happened I was trying to checkout inside the else statement with
checkout.setName("branch-for-test").setStartPoint(key);
It did not throw any error but it did not checkout the tag either.
Well, it seems that using JGit in Windows may generate conflicts related to managed files sometimes. What I made for solving this recurrent issue was to execute a git clean --force followed by a git reset --hard before each git checkout <ref_name>. This was totally fine for me, as I didn't need to stage changes...
The problem was that basically after using some files (even in a read-only way), they were marked as changed (I verified it with git status). The solution explained above implied more operations, but totally solved my problem.
For further details, refer to git documentation about these actions:
Git clean: Removes untracked files from the working tree.
Git reset: Resets current HEAD to the specified state.
And develop the appropiate implementation of these two actions with JGit:
Clean with Clean Command.
Reset with Reset Command
After refactoring some packages/classes, when i try to commit my project i get this error:
org.tigris.subversion.javahl.ClientException: svn: Commit failed (details follow):
svn: Item 'One-of-my-project's-package' is out of date
svn: DELETE of '/svn/Repository/!svn/wrk/fe1d333f-3901-0010-acd1-d750d86b0019/One-of-my-project's-package': 409 Conflict (https://mysvnrepositoryserver.com)
The SVN command returned with an error which indicates that some files in your working copy are out of date.
Run update and attempt your command again.
How i can fix it? Running "update" won't overwrite my classes, deleting all the latest modifications?
This has happened many times to me, it is very frustrating. Updating won't disturb anything if nobody else has committed in the meantime, and even if there were other commits, only a regular update will happen that will merge the changes into your files (or, in case of a conflict, generate the usual commit markings). However, the update may not help, either. What is usually at hand is a "tree conflict", which doesn't concern any specific file, but directory info. You probably renamed a package, that renamed a directory and created your situation.
Try updating and, if it doesn't help, you probably will have to make a backup and manually revert parts of the working tree, then reapply your changed files.
tl;dr JGit's checkout throws exceptions while command line git checkout works fine
I'm currently trying to use JGit to check out certain revisions from an online Git repository, in Java (for work). My current approach is (and I'm very new to Git, coming from a SVN background, so this may be wrong):
clone the repository to a temporary location on my hard drive
figure out which revision I want, (I have tried using the SHA-1 hash as well as the name of a branch)
checkout that revision
from there, I would be using the checked out files as inputs to a later part of the program.
checkout a different revision
use those files as inputs to another part of the program
Essentially, I want to be able to swap the contents of my temp folder with whichever revision. With the command line interface I've been able to do this with git checkout master and git checkout dylanbranch (where dylanbranch is a branch I made on my own clone with an arbitrarily chosen revision), but my Java code attempting to do the same thing fails:
Git git = Git.open(new File("checkout")); //checkout is the folder with .git
git.checkout().setName("master").call(); //succeeds
git.checkout().setName("dylanbranch").call(); //fails
And the exceptions printed to the console:
Exception in thread "main" org.eclipse.jgit.api.errors.JGitInternalException: Checkout conflict with files:
src/sizzle
test/qunit
at org.eclipse.jgit.api.CheckoutCommand.call(CheckoutCommand.java:211)
at com.avi.scm.git.BranchCheckout.main(BranchCheckout.java:30)
Caused by: org.eclipse.jgit.errors.CheckoutConflictException: Checkout conflict with files:
src/sizzle
test/qunit
at org.eclipse.jgit.dircache.DirCacheCheckout.checkout(DirCacheCheckout.java:387)
at org.eclipse.jgit.api.CheckoutCommand.call(CheckoutCommand.java:162)
... 1 more
I can verify that the files in question are marked as deleted and not staged for commit by using git status though I'm not sure why those changes are there, and they come back any time I switch back to the master branch. Despite that, I can still successfully change the working tree with command line Git.
So my question: Why won't JGit work for this application when command line git will?
Any other helpful information is appreciated- educate me :)
Update I've been testing with the jQuery repository, and have noticed a few more problems with JGit: When I am working with the "master" branch, git status temms me that I'm #On branch master and that there is nothing to commit (working directory clean), but using JGit's status command I see that test/qunit and src/sizzle are marked as Missing. JGit's reset seems to do nothing.
The two directories mentioned in the stack trace are Git submodules (test/qunit and src/sizzle) which is most likely the cause of the problem since JGit does not have full submodule support yet.
This may function differently in the 1.1 JGit release due out this month based on this commit.
You can read more about the current state of JGit submodule support here.
I know this doesn't directly answer your question, but I've also had problems with the Java implementations of Git. What worked best for me was to simply ditch the java implementations, and execute command-line calls to git from within the application. It may not be ideal, but it'll do exactly what you want since you'll fully control the command.
Simply call
Runtime.getRuntime().exec(...)
Link to Javadoc for Runtime class
I had a similar problem with Checkout. I think that the fact that you can switch branch with unstaged content in Git is actually a tolerance, not a feature.
JGit is globally not as tolerant as Git, so you should usually test many cases.
It seems it is not directly your problem (which is related to the submodules), but for more general cases you would want to commit your changes before using checkout to switch to another branch.
Note that the CheckoutCommand works perfectly for me to start a new branch from an old revision (you have to set the name of the branch and the start revision).