branch

Is there an easy way to change to previously active branch?

由 你说的曾经没有我的故事 提交于 2019-12-12 12:08:38
问题 I'm using git (in fact, msysgit) 1.6.4 on Windows. Most of the time I'm doing work in some feature branches. Every now and then, I want to hop back to master to cherry-pick one particular commit I did in my feature branch - usually because it's a useful bugfix which makes sense even without the feature. My workflow is like this - if this is unnecessarily complicated, please tell me :-) : git checkout -b mycoolfeaturebranch // hack away, implementing a feature and one bugfix (while I'm at it)

Is there a 3 way merger tool that “understands” common refactoring?

由 你。 提交于 2019-12-12 11:00:46
问题 When a simple refactoring like “rename field” has been done on one branch it can be very hard to merge the changes into the other branches. (Extract method is much harder as the merge tools don’t seem to match the unchanged blocks well) Now in my dreams , I am thinking of a tool that can record (or work out) what well defined refactoring operations have been done on one branch and then “replay” them on the other branch, rather than trying to merge every line the refactoring has affected. see

SVN - When you tag a working copy is it still a cheap copy?

由 北慕城南 提交于 2019-12-12 10:39:58
问题 Using Subversion, in my working copy I make a minor modification (update a version number). I would then like to tag my working copy. Would this tag still be a cheap copy with the modification, or would SVN duplicate the files? I would hate to see my repository grow enormously in size because I'm trying to save a version number change. The reason I ask about creating a tag that contains a modification rather than committing then tagging involves my build server. The build server creates a

JGit : How to get Branch when traversing repos

由 Deadly 提交于 2019-12-12 10:38:34
问题 The lacking JGit docs dont seem to say anything about how to use/detect branches while using a RevWalk. This question says pretty much the same thing. So my question is: How do I get the branch name/id from a RevCommit? Or how do I specify which branch to traverse before hand? 回答1: Found out a better way to do it by looping branches. I looped over the branches by calling for (Ref branch : git.branchList().call()){ git.checkout().setName(branch.getName()).call(); // Then just revwalk as normal

Branching with Mercurial SCM

由 最后都变了- 提交于 2019-12-12 08:51:28
问题 So right now I'm learning Ruby on Rails, and I'm working through the book "Agile Web Development with Rails". I've also decided that I want to give Mercurial a go, because I've read up on distributed SCM's, and it seems like an ideal situation. I still, however, prefer to push my code remotely to my Linux VPS just incase my hard drive decides to take a dive. So, my question is specific to branching in Mercurial. Right now I've got a remote repository set up and I can push changes over SSH

How git branches and tags are stored in disks?

由 拟墨画扇 提交于 2019-12-12 08:15:26
问题 I recently checked one of my git repositories at work, which had more than 10,000 branches and more than 30000 tags. The total size of the repo, after a fresh clone is 12Gigs. I am sure there is no reason to have 10000 branches. So I believe they would occupy considerable amount of space in the disks. So, my questions are as follows How branches and tags are stored in disks, like what data-structure used, what information is stored for every branch? How do I get the metadata about the

Handling temporary changes (not to be committed) in Git

由 ↘锁芯ラ 提交于 2019-12-12 07:10:18
问题 Often while working on a branch I need to introduce some "temporary" changes (such as additional debugging info, or a change which lets me better observe the thing i'm actually working on). About these "temporary" changes: I want them in my working copy of my branch , because they help me to work on the actual change, I don't want them committed to the branch , because the branch is going to be merged into master some time and they're not production code. Currently I just keep them as

Clean master branch but also detailed record of intermediary commits

由 安稳与你 提交于 2019-12-12 05:14:21
问题 Goal : keep a clean history of master, whilst also keeping the intermediary commits. For instance , let's start with a master branch: M1 --- M2 --- M3 ^ master I work on a feature/bug/whatever on a new branch: M1 --- M2 --- M3 ^ \ | \- F1 --- F2 -- F3 | ^ master feature And when I merge into master, I want M3 to be the parent, but also keep the "iterations" you took to reach from M3 to the new commit. This can be done with merge --no-ff : M1 --- M2 --- M3 ----------------------- M4 \ / ^ \-

Git使用

由 喜欢而已 提交于 2019-12-12 05:12:29
Android Studio结合Git使用这个哥们写的很详细，正是看了他写的，才有想法把自己经常使用的命令记录以下 一、 查看分支： 1、查看本地分支： git branch 2、查看远程分支 git branch -r 3、查看所有分支 git branch -a 二、删除分支 1、删除本地分支 git branch -d 本地分支名称 2、删除远程分支 git push origin --delete 远程分支名称 三、将本地分支关联到远程分支 git branch --set-upstream-to=origin/远程分支 本地分支 四、查看本地分支与远程分支的关联配置 三种方法均可 1、git branch -vv 2、git remote show origin 3、cat .git/config 五、git tag — 标签相关操作 标签可以针对某一时间点的版本做标记，常用于版本发布。 列出标签 $ git tag # 在控制台打印出当前仓库的所有标签 $ git tag -l ‘v0.1.*’ # 搜索符合模式的标签 打标签 git标签分为两种类型：轻量标签和附注标签。轻量标签是指向提交对象的引用，附注标签则是仓库中的一个独立对象。建议使用附注标签。 创建轻量标签 $ git tag v0.1.2-light #创建附注标签 $ git tag -a v0.1.2

Provisioning profile prefix different than that it compiles with

由 ≯℡__Kan透↙ 提交于 2019-12-12 04:59:29
问题 I'm running into problems getting Branch to work for deep linking. My thought is it's because of the app prefix. I go to the developer portal and create a new app id: Then I create a new provisioning profile using that app id: When I go to set my prov profile and dev cert the prefix do not match: So I'm guessing that the app is being compiled with a different prefix than what's in the provisioning profile. So when I try to deep link from Branch, it's not finding the app. I've tried creating
订阅 branch