Feeling Lucky
?
[#5195] - Update sample_testing.sql
- Closed
- 1 Dec 2014
- Medium
- Build: 3.4-dev
- # 5195
- Diff
- alikon:patch-1
- Error The Travis CI build could not complete due to an error Details
Related to
# 5185
Referenced as
Related to:
# 5185
User tests: Successful: Unsuccessful:
jissues-bot
- | Labels |
Added:
?
|
||
| Category | ⇒ | SQL |
| Rel_Number | ⇒ | 5185 | |
| Relation Type | ⇒ | Related to |
roland-d
- comment
- 26 Nov 2014
That is correct, he has to pull in my changes.
smanzi
- comment
- 26 Nov 2014
OK, and... just to understand how to behave in such situation, would it be correct to do something like this in the git shell?
git checkout whatever_is_my_branch
git fetch upstream
git merge upstream/staging
Is that correct?
roland-d
- comment
- 26 Nov 2014
@smanzi I am not sure. Let's call in the troops. @Bakual @phproberto @mbabker can you confirm if that is correct?
alikon
- comment
- 27 Nov 2014
When we have confirmation I'll need your help cause i'm a perfect github dumb
This comment was created with the J!Tracker Application at issues.joomla.org/joomla-cms/5195.
brianteeman
- comment
- 1 Dec 2014
Closed see #5260, #5261, #5262
This comment was created with the J!Tracker Application at issues.joomla.org/joomla-cms/5195.
| Status | Pending | ⇒ | Closed |
| Closed_Date | 0000-00-00 00:00:00 | ⇒ | 2014-12-01 10:46:16 |
@alikon We are touching the same file #5174. Something we need to take into consideration I think.