Code Merge Across Branches.

17 views
Skip to first unread message

Shivam Verma

unread,
Jun 21, 2014, 10:26:41 AM6/21/14
to privly...@googlegroups.com
Hey Ivan, Gitanshu.

I have been going through your latest code for sometime now and would like to leave some comments.

But Before I do that, can you please merge the various branches of your respective repos into your master and then send pull requests to privly-android (master).
Also, Please close any existing PRs and create a new one asap.


Ivan Metla

unread,
Jun 22, 2014, 9:52:24 AM6/22/14
to privly...@googlegroups.com
Hi, Shivam.
 What you  mean under " PRs"?

Sean McGregor

unread,
Jun 22, 2014, 12:00:04 PM6/22/14
to Ivan Metla, privly...@googlegroups.com
Pull requests = PRs

On Sun, Jun 22, 2014 at 6:52 AM, Ivan Metla <metl...@gmail.com> wrote:
>> Hi, Shivam.
>
> What you mean under " PRs"?
>
> --
> You received this message because you are subscribed to the Google Groups
> "privly-mobile" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to privly-mobil...@googlegroups.com.
> For more options, visit https://groups.google.com/d/optout.



--
Sean McGregor

Oregon State University, Department of Computer Science
Twitter: seanmcgregor
irc.freenode.net: smcgregor

Ivan Metla

unread,
Jun 22, 2014, 12:05:23 PM6/22/14
to privly...@googlegroups.com
Thank you Sean.

суббота, 21 июня 2014 г., 17:26:41 UTC+3 пользователь Shivam Verma написал:

Ivan Metla

unread,
Jun 22, 2014, 12:23:09 PM6/22/14
to privly...@googlegroups.com
I created pull request https://github.com/privly/privly-android/pull/19.


суббота, 21 июня 2014 г., 17:26:41 UTC+3 пользователь Shivam Verma написал:
Hey Ivan, Gitanshu.

Shivam Verma

unread,
Jun 24, 2014, 6:45:41 AM6/24/14
to privly...@googlegroups.com
So I reviewed both the PRs. Things look good.
Please resolve the issues asap and let's merge both of your codes together and then into the final repo.

@Gitanshu
Since Ivan has already merged your code, check if any of the comments I left on his PR need your attention.

Ivan Metla

unread,
Jun 26, 2014, 1:15:06 AM6/26/14
to privly...@googlegroups.com
@Shivam
Hi, Shivam. I with Gitanshu merged our repo https://github.com/privly/privly-android/pull/20. In future we work in the same repo for better merge. 

суббота, 21 июня 2014 г., 17:26:41 UTC+3 пользователь Shivam Verma написал:
Hey Ivan, Gitanshu.
Reply all
Reply to author
Forward
0 new messages