smartgit

How to checkout and reset using smartgit?

╄→尐↘猪︶ㄣ 提交于 2019-12-02 03:00:46
Need help in understanding the below 1). How do i check out to a particular commit and again revert back to the recent commit ? Tried branch->checkout->same branch and check out to the previous commit, but when i did this the commits made after the one i checked out now got lost ! Its not in the list to checkout to recent commit ! 2). How do i reset my head to a particular commit ? (1) Usually, branch refs won't be changed by a Check Out , so you may use Check Out again to switch back to your branch: simply select the corresponding branch for "Showing Branches" selector. If the branch ref to

SmartGit: File or Directory out of date error message when it is not?

与世无争的帅哥 提交于 2019-12-02 02:23:12
Someone please help me understand my mistake/misunderstanding of what's happening below: This is an SVN repository. As you can see, I have two branches and committed a few independent changes to the release. According to the log above, both server branches map back into the current local release branch which is a few commits ahead. If I go to push the changes of release back to the remote server. I get the following error: It would seem the error is some how related to an SVN problem "409 conflict" but searching around doesn't reveal any useful information. So I've tried pulling changes from

How to commit & push selected files but not all in Git

一个人想着一个人 提交于 2019-12-01 23:44:37
问题 I have a git repo with two branches: develop and master . I work mostly at develop and when files are ready (sometimes not so sticky to this affirmation) I merge them to master branch to put them on production. Take a look to this pic: All that files comes from develop branch and was merged but I only want to commit and push RepresentativeRestController.php but any time I do right click => commit all of them are included on the commit. How I get rid, temporary since they will be added later,

How to commit & push selected files but not all in Git

左心房为你撑大大i 提交于 2019-12-01 21:20:14
I have a git repo with two branches: develop and master . I work mostly at develop and when files are ready (sometimes not so sticky to this affirmation) I merge them to master branch to put them on production. Take a look to this pic: All that files comes from develop branch and was merged but I only want to commit and push RepresentativeRestController.php but any time I do right click => commit all of them are included on the commit. How I get rid, temporary since they will be added later, of the ones I don't want to be included on the commit? I use Smartgit as a GUI client for Bitbucket

smartgit delete commit and return to previous commit

99封情书 提交于 2019-11-30 13:02:59
By mistake i have made a commit that now i want to delete from the history log and return to a previous commit. I have been trying to checkout the commit that i want to return to but Smartgit ask me to create a local branch in order to do this (screen shot attached) and since im not an expert with SG i really need some advice. I have also try to revert the commit that i made by mistake but i still see the commit on the log. This is how the log look now: When trying to checkout : How my log looks at the moment : What i want to do is delete the first two commits from the log and return to the

smartgit delete commit and return to previous commit

删除回忆录丶 提交于 2019-11-29 18:19:22
问题 By mistake i have made a commit that now i want to delete from the history log and return to a previous commit. I have been trying to checkout the commit that i want to return to but Smartgit ask me to create a local branch in order to do this (screen shot attached) and since im not an expert with SG i really need some advice. I have also try to revert the commit that i made by mistake but i still see the commit on the log. This is how the log look now: When trying to checkout : How my log

SmartGit won't authenticate with ssh

社会主义新天地 提交于 2019-11-28 09:47:37
I have a webserver with gitolite installed and where i login using my ssh key. Normally i just use git on the server itself using the command line but for a new project i need to clone a repo on my windows pc and i would like to use SmartGit for this. But i've spend several hours already just to clone the repo via Smartgit. As remote Git i use the url i normally would use on the server: me@my-server:the-repo then after a while i get a dialogue box 'SSH Authentication' and i select my private key, as i would do for pagent, and put in my Passphrase. But when i click login it just tries to

Merge commit vs normal commit

心已入冬 提交于 2019-11-28 09:05:30
On daily routine i use SmartGit as client of choose. My team members however stick to git native, non commercial GUI. We discovered some differences in how our merge commits looks like. Those are options that SmartGit gives when requested to merge branch: On below graph you can see my example SmartGit graph output, containing: single master branch One branch merged to master with merge commit option One branch merged with simple commit option One of branches ( with_merge_branch ) is visualizing merge operation by joining branch with master via line. Second one ( normal_commit_branch ) does not

SmartGit won't authenticate with ssh

主宰稳场 提交于 2019-11-27 05:52:06
问题 I have a webserver with gitolite installed and where i login using my ssh key. Normally i just use git on the server itself using the command line but for a new project i need to clone a repo on my windows pc and i would like to use SmartGit for this. But i've spend several hours already just to clone the repo via Smartgit. As remote Git i use the url i normally would use on the server: me@my-server:the-repo then after a while i get a dialogue box 'SSH Authentication' and i select my private

Merge commit vs normal commit

天大地大妈咪最大 提交于 2019-11-27 02:39:21
问题 On daily routine i use SmartGit as client of choose. My team members however stick to git native, non commercial GUI. We discovered some differences in how our merge commits looks like. Those are options that SmartGit gives when requested to merge branch: On below graph you can see my example SmartGit graph output, containing: single master branch One branch merged to master with merge commit option One branch merged with simple commit option One of branches ( with_merge_branch ) is