Git: Your branch is ahead of the tracked remote branch

明年今日 — Fri, 24 Feb 2012 09:07:00 GMT

Problem

When moving to a local branch, git says I'm "ahead of the tracked remote branch", but a git push doesn't update the remote branch.

$ git checkout mybranch 

Your branch is ahead of the tracked remote branch 'origin/remotebranch' by 1 commit. 

$ git push Everything up-to-date

Solution 1. Pushing mybranch to remotebranch

$ git push origin mybranch:remotebranch

or for later pushes with just git push origin you can put this in .git/config with this command:

$ git config remote.origin.push mybranch:remotebranch

Solution 2. Reset mybranch to state of remotebranch

NOTE: Careful! You will loose commits made to mybranch!

$ git reset --hard origin/remotebranch

Problem: You cann't push to git://github.com/username/repo.git

There should be something wrong with your remote configuration, set like the follow:


$ git remote rm origin 

$ git remote add origin 

$ git remote add origin git@github.com:tualatrix/gentoo.git 

$ git push origin

Problem: Permission denied (publickey)

Generate a new SSH key.

To generate a new SSH key, enter the code below. We want the default settings so when asked to enter a file in which to save the key, just press enter.

$ ssh-keygen -t rsa -C "your_email@youremail.com"Creates a new ssh key using the provided emailGenerating public/private rsa key pair.Enter file in which to save the key (/Users/your_user_directory/.ssh/id_rsa):

Now you need to enter a passphrase.

Why do passphrases matter?

Enter passphrase (empty for no passphrase):Enter same passphrase again:

Which should give you something like this:

Your identification has been saved in /Users/your_user_directory/.ssh/id_rsa.Your public key has been saved in /Users/your_user_directory/.ssh/id_rsa.pub.The key fingerprint is:01:0f:f4:3b:ca:85:d6:17:a1:7d:f0:68:9d:f0:a2:db user_name@username.comThe key's randomart image is:+--[ RSA 2048]----+|     .+   +      ||       = o O .   ||        = * *    ||       o = +     ||      o S .      ||     o o =       ||      o . E      ||                 ||                 |+-----------------+

Add your SSH key to GitHub.
On the GitHub site Click “Account Settings” > Click “SSH Public Keys” > Click “Add another public key”
Open the id_rsa.pub file with a text editor (Notepad, TextEdit, or gedit will do just fine). This is your public SSH key. You may need to turn on “view hidden files” to find it because the.ssh directory is hidden. It’s important you copy your SSH key exactly as it is written without adding any newlines or whitespace. Now paste it into the “Key” field.

Problem: Delete file on remote repo

$ git add . -A
$ git commit -m "remove some file"

$ git add . -A
$ git commit -m "remove some file"

明年今日 2012-02-24 17:07 发表评论

User Story in Scrum

明年今日 — Tue, 21 Feb 2012 03:03:00 GMT

对于Scrum开发来��_��User Story是开发的基础�Q�它不同于传�l�的UDD开发方式，而是把原本需求拆成最��粒度的Story�Q�以方便Scrum��组拆分Task�Q�估计开�?/div>

旉��Q�领取开发�Q务�?br />

User Story不需要太�q�于详细�Q�只有在正式开发时�Q�做详细设计时在�q�入Detail阶段�Q�如果初期时间估��不准确�Q�实际工作量增多�Ӟ��Sprint Chart需要适当�?/div>

Burn-up�?br />

User Story可以遵��@以下模板�Q?/div>

As a

I want to

So that I can

例如�Q�作��Z��个病人，我可以预�U�一个医生，让他�l�我看病�?/div>

User Story应遵循INVEST规则�Q?/div>

Independent 独立性，避免与其他Story的依赖性�?/div>

Negotiable 可谈判性，Scrum中的story不是瀑布开始某事中的Contract, Stories不必太过详细�Q�开发�h员可以给出适当的徏议�?/div>

Valueable 有�h值性， Story需要体现出对于用户的�h�?/div>

Estimable 可估计性，Story应可以估计出Task的开发时间�?/div>

Sized Right 合理的尺寸， Stories应该��量��，�q�且使得团队��量�?个sprint(2 weeks)中完成�?/div>

Testable 可测试性， User Story应该是可以测试的�Q�最好有界面可以��试和自动化��试。每个�Q务都应有Junit Test.

�l�验�Q?/div>

1. 永远不要在User Story中��用And和Or�Q�因��是些分支词就表示分支��d��Q�把它们拆成两个Story.

2. 数据整理�Q�通常情况�?个sprint(2周一�ơ�P�?可以�?�?个Story�Q�极端大的Story不可大于1个sprint�?/div>

3. 数据整理�Q�通常情况�?个sprint(2周一�ơ�P�?可以�?0个左右的Task�?/div>

4. User Story用于描述用户故事�Q?span style="background-color: yellow; ">不要包括��M��的技术，框架�{�内宏V��Task可以包括框架�Q�技术等内容�?br />

我们通常用User Story来描�q�Backlog里的各个Backlog��，User Story是从用户的角度对�pȝ��的某个功能模块所作的��短描�q�。一个User Story描述了项目中的一个小功能�Q�以�?gt;�q�个功能完成之后��会产生什么效果，或者说能�ؓ客户创造什么�h倹{�?br />

User Story要由Stakeholder�Q�利益相兌��）来编写。User Story的�Ş式很��单，��Z��可以很容易地掌握�~�写User Story的方法。这样就可以保证是由与项目相关领域专家们�?/div>

�~�写User Story�Q�而不是开发�h员�?/span>

我们通常把User Story写在一张小卡片上，同时在卡片上标明它的优先�U�和预计完成旉��Q�以便开发�h员根据�Q务的优先�U�来制定Sprint Backlog。而且�Q�Stakeholder可以随时更改一个Story的优先��Q�那么此时开发�h员就应该相应地调整Story的开发次序�?/div>

一个User Story的大��和复杂度应该在一个Sprint中开发完毕�ؓ宜。如果User Story太大�Q�可能会��D��对它的开发横跨几个Sprint。这�U�情冉|��需要避免的。此时就应该��这个User Story分解�?/div>

��Z��能及时、高效地完成每个Story�Q�Scrum团队会把每个Story分解成若�q�个Task。每个Task都是可以在明��的旉��内完成的�Q�而且旉��是以��时��量单位的。特别提�C�：每个Task的时间最好不要超�q?��时�Q�就是要保证1个工作日内完成，如果做计划时发现有些Task的时间超�q�了8��时�Q�就说明Task的划分有问题�Q�需要特别注意�?/div>

明年今日 2012-02-21 11:03 发表评论

91亚洲国产成人久久精品 ,亚洲二区在线视频,成人亚洲国产精品久久